#include <iostream>

using std::cout;
using std::endl;

<<<<<<< HEAD
void test1(){
    cout<<"hello world"<<endl;
}
//冲突1，修改名字

void test2(){

}
//冲突2，无中生有
=======
void test(){
    cout<<"hello world"<<endl;
}

>>>>>>> test4
int main(int argc,char *argv[])
{
    test();
    return 0;
}

